Skip to content

Backport new zms backend #21735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Apr 14, 2025
Merged

Backport new zms backend #21735

merged 3 commits into from
Apr 14, 2025

Conversation

rghaddab
Copy link
Contributor

@rghaddab rghaddab commented Apr 12, 2025 •
edited
Loading

Introduces a new ZMS backend and changes some CONFIGs needed by some samples

test_crypto: PR-793

@rghaddab rghaddab requested review from a team and annwoj as code owners April 12, 2025 13:34
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. manifest labels Apr 12, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Apr 12, 2025 •
edited
Loading

The following west manifest projects have changed revision in this Pull Request:

Name Old Revision New Revision Diff
find-my nrfconnect/[email protected] https://github.com/nrfconnect/sdk-find-my/commit/e6aed64bbb1bf114efadb08daa3f72da1d9149c6 (v3.0-branch) nrfconnect/[email protected]
matter nrfconnect/[email protected] nrfconnect/sdk-connectedhomeip@d2fe385 (v3.0-branch) nrfconnect/[email protected]
zephyr nrfconnect/sdk-zephyr@4575fc8 nrfconnect/sdk-zephyr@224429b (v4.0.99-ncs1-branch) nrfconnect/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Apr 12, 2025 •
edited
Loading

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 7

Inputs:

Sources:

sdk-nrf: PR head: d33c50127ebc880e77d551d4103af0c118fa7dc3
find-my: PR head: e6aed64bbb1bf114efadb08daa3f72da1d9149c6
matter: PR head: d2fe385b0f4c8ac6206400c20f0f16c5844c55d8
zephyr: PR head: 224429ba5dfbe5fc8d11c32d2a48273b36e87315

more details

sdk-nrf:

PR head: d33c50127ebc880e77d551d4103af0c118fa7dc3
merge base: aec68f0d4c03eae057ef59368d22c0aafc3c1755
target head (v3.0-branch): aec68f0d4c03eae057ef59368d22c0aafc3c1755
Diff

find-my:

PR head: e6aed64bbb1bf114efadb08daa3f72da1d9149c6
merge base: 01af9578b7510f4f312c274465b92c27ef67c474
Diff

matter:

PR head: d2fe385b0f4c8ac6206400c20f0f16c5844c55d8
merge base: df5368cb9beec725a7ccac725a4aecec272b1897
Diff

zephyr:

PR head: 224429ba5dfbe5fc8d11c32d2a48273b36e87315
merge base: 4575fc863ae46dc0f65593cb741660ddab1ba344
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (102) 
CODEOWNERS
doc
│  ├── nrf
│  │  ├── app_dev
│  │  │  ├── device_guides
│  │  │  │  ├── nrf54l
│  │  │  │  │  │ zms.rst
│  │  ├── releases_and_maturity
│  │  │  ├── migration
│  │  │  │  │ migration_guide_3.0.rst
include
│  │ flash_map_pm.h
modules
│  ├── lib
│  │  ├── matter
│  │  │  ├── src
│  │  │  │  ├── platform
│  │  │  │  │  ├── Zephyr
│  │  │  │  │  │  ├── ConfigurationManagerImpl.cpp
│  │  │  │  │  │  │ KeyValueStoreManagerImpl.cpp
samples
│  ├── bluetooth
│  │  ├── mesh
│  │  │  ├── ble_peripheral_lbs_coex
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── chat
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── dfu
│  │  │  │  ├── distributor
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  ├── target
│  │  │  │  │  ├── boards
│  │  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── light
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── light_ctrl
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── light_dimmer
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── light_switch
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── sensor_client
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── sensor_server
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  ├── silvair_enocean
│  │  │  │  ├── boards
│  │  │  │  │  ├── nrf54l15dk_nrf54l05_cpuapp.conf
│  │  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  ├── common
│  │  ├── mcumgr_bt_ota_dfu
│  │  │  │ Kconfig
│  ├── matter
│  │  ├── common
│  │  │  ├── src
│  │  │  │  ├── persistent_storage
│  │  │  │  │  │ persistent_storage_shell.cpp
│  │  ├── light_bulb
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  ├── light_switch
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  ├── lock
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  │  ├── src
│  │  │  │  ├── access
│  │  │  │  │  │ access_storage.cpp
│  │  ├── manufacturer_specific
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  ├── smoke_co_alarm
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  ├── template
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l10_cpuapp.conf
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp_internal.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  ├── thermostat
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  │  ├── window_covering
│  │  │  ├── boards
│  │  │  │  ├── nrf54l15dk_nrf54l15_cpuapp.conf
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_ns.conf
│  ├── openthread
│  │  ├── cli
│  │  │  ├── boards
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
│  │  ├── coprocessor
│  │  │  ├── boards
│  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.conf
scripts
│  ├── ci
│  │  │ license_allow_list.yaml
subsys
│  ├── CMakeLists.txt
│  ├── Kconfig
│  ├── partition_manager
│  │  ├── CMakeLists.txt
│  │  │ Kconfig
│  ├── settings
│  │  ├── CMakeLists.txt
│  │  ├── Kconfig
│  │  ├── include
│  │  │  ├── settings
│  │  │  │  │ settings_zms_legacy.h
│  │  ├── src
│  │  │  ├── CMakeLists.txt
│  │  │  │ settings_zms_legacy.c
│  ├── trusted_storage
│  │  │ Kconfig
west.yml
zephyr
│  ├── doc
│  │  ├── services
│  │  │  ├── settings
│  │  │  │  │ index.rst
│  │  │  ├── storage
│  │  │  │  ├── zms
│  │  │  │  │  │ zms.rst
│  │  │ zephyr.doxyfile.in
│  ├── include
│  │  ├── zephyr
│  │  │  ├── fs
│  │  │  │  │ zms.h
│  │  │  ├── settings
│  │  │  │  │ settings.h
│  ├── samples
│  │  ├── subsys
│  │  │  ├── fs
│  │  │  │  ├── zms
│  │  │  │  │  ├── Kconfig
│  │  │  │  │  ├── README.rst
│  │  │  │  │  ├── prj.conf
│  │  │  │  │  ├── sample.yaml
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c
│  ├── subsys
│  │  ├── fs
│  │  │  ├── zms
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── Kconfig
│  │  │  │  ├── zms.c
│  │  │  │  │ zms_priv.h
│  │  ├── settings
│  │  │  ├── Kconfig
│  │  │  ├── include
│  │  │  │  ├── settings
│  │  │  │  │  │ settings_zms.h
│  │  │  ├── src
│  │  │  │  ├── settings_store.c
│  │  │  │  │ settings_zms.c
│  ├── tests
│  │  ├── subsys
│  │  │  ├── fs
│  │  │  │  ├── zms
│  │  │  │  │  ├── Kconfig
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c
│  │  │  ├── settings
│  │  │  │  ├── functional
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ settings_basic_test.c
│  │  │  │  │  ├── zms
│  │  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  │  ├── prj.conf
│  │  │  │  │  │  ├── settings_test_zms.c
│  │  │  │  │  │  │ testcase.yaml
│  │  │  │  ├── performance
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── prj.conf
│  │  │  │  │  ├── settings_test_perf.c
│  │  │  │  │  │ testcase.yaml

File list hidden for private repositories.
If you have access you can see the diff via the github link.
find-my Diff

Outputs:

Toolchain

Version: 7cbc0036f4
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:7cbc0036f4_8bf7ca4353

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
  • ❌ Integration tests
    • ✅ test-sdk-audio
    • ❌ desktop52_verification
    • ✅ test-fw-nrfconnect-boot
    • ✅ test-fw-nrfconnect-apps
    • ✅ test_ble_nrf_config
    • ✅ test-fw-nrfconnect-ble_mesh
    • ✅ test-fw-nrfconnect-ble_samples
    • ❌ test-fw-nrfconnect-chip
    • ✅ test-fw-nrfconnect-nfc
    • ❌ test-fw-nrfconnect-nrf-iot_cloud
    • ✅ test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • ✅ test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • ✅ test-fw-nrfconnect-nrf-iot_samples
    • ✅ doc-internal
    • ❌ test-fw-nrfconnect-nrf-iot_thingy91
    • ❌ test-fw-nrfconnect-nrf_crypto - Error: Error starting job: Failed to trigger build of latest/sub/test-fw-nrfconnect-nrf_crypto/PR-793
    • ❌ test-fw-nrfconnect-proprietary_esb
    • ✅ test-fw-nrfconnect-rpc
    • ✅ test-fw-nrfconnect-rs
    • ✅ test-fw-nrfconnect-fem
    • ✅ test-fw-nrfconnect-tfm
    • ❌ test-fw-nrfconnect-thread
    • ✅ test-sdk-find-my
    • ❌ test-fw-nrfconnect-nrf-iot_mosh
    • ❌ test-fw-nrfconnect-nrf-iot_positioning
    • ❌ test-sdk-wifi
    • ✅ test-low-level
    • ✅ test-sdk-pmic-samples
    • ✅ test-sdk-mcuboot
    • ❌ test-sdk-dfu
    • ❌ test-fw-nrfconnect-ps
    • ✅ test-secdom-samples-public
    • ⚠️ test-fw-nrfconnect-fw-update

Note: This message is automatically posted and updated by the CI

@github-actions GitHub Actions
Copy link

You can find the documentation preview for this PR here.

Preview links for modified nRF Connect SDK documents:

https://ncsdoc.z6.web.core.windows.net/PR-21735/nrf/app_dev/device_guides/nrf54l/zms.html
https://ncsdoc.z6.web.core.windows.net/PR-21735/nrf/releases_and_maturity/migration/migration_guide_3.0.html

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Apr 12, 2025 •
edited
Loading

Memory footprint analysis revealed the following potential issues

applications.nrf_desktop.zdebug.uart.kmu_provision[nrf54l15dk/nrf54l15/cpuapp]: ROM size increased by 1228[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[nrf54l15dk/nrf54l15/cpuapp]: ROM size increased by 1032[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease_keyboard[nrf54l15dk/nrf54l05/cpuapp]: ROM size increased by 904[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease_fast_pair.gmouse[nrf54l15dk/nrf54l05/cpuapp]: ROM size increased by 900[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug.uart.kmu_provision[nrf54l15dk/nrf54l10/cpuapp]: ROM size increased by 1292[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug.uart[[email protected]/nrf54h20/cpuapp]: ROM size increased by 904[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease_dongle[[email protected]/nrf54h20/cpuapp]: ROM size increased by 944[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug[nrf54l15dk/nrf54l05/cpuapp]: ROM size increased by 1024[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_keyboard.uart.kmu_provision[nrf54l15dk/nrf54l15/cpuapp]: ROM size increased by 1144[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zrelease[[email protected]/nrf54h20/cpuapp]: ROM size increased by 944[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_fast_pair.gmouse.uart.kmu_provision[nrf54l15dk/nrf54l15/cpuapp]: ROM size increased by 1168[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)
applications.nrf_desktop.zdebug_dongle.uart[[email protected]/nrf54h20/cpuapp]: ROM size increased by 1076[B] in comparison to the main[dd96a68] branch. - link (cc: @MarekPieta)

Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-21735/7)

@rghaddab rghaddab force-pushed the rghaddab/backport-new-zms-backend branch from c91731b to 19529cd Compare April 13, 2025 13:18
@umapraseeda umapraseeda added this to the 3.0.0 milestone Apr 14, 2025
@rghaddab rghaddab force-pushed the rghaddab/backport-new-zms-backend branch from 19529cd to c1329a3 Compare April 14, 2025 08:59
@rghaddab rghaddab force-pushed the rghaddab/backport-new-zms-backend branch from c1329a3 to dd70650 Compare April 14, 2025 11:28
NordicBuilder and others added 2 commits April 14, 2025 17:21
@NordicBuilder @rghaddab
manifest: Update manifest files and change some CONFIGs
b571543 
Update manifest for sdk-zephyr, connectedhomeip and sdk-find-my.
Some of the CONFIGs for ZMS and for its backend for Settings has been
added and others deleted.

Signed-off-by: Nordic Builder <[email protected]>
(cherry picked from commit f7b978f)
@rghaddab
settings: add ZMS legacy backend for backward compatibility
a62af54 
The legacy ZMS backend is needed by some applications that need to
maintain their backward compatibility.

Signed-off-by: Riadh Ghaddab <[email protected]>
(cherry picked from commit f759bc3)
@rghaddab
doc: migration_guide: add note on new ZMS backend for Settings
d33c501 
Add notes on how to maintain backward compatibility with legacy backend
Details some Kconfig options added with the new backend.

Signed-off-by: Riadh Ghaddab <[email protected]>
(cherry picked from commit 0701042)
@rghaddab rghaddab force-pushed the rghaddab/backport-new-zms-backend branch from dd70650 to d33c501 Compare April 14, 2025 15:23
@NordicBuilder NordicBuilder removed the DNM label Apr 14, 2025
@carlescufi carlescufi merged commit 8215409 into nrfconnect:v3.0-branch Apr 14, 2025
12 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@carlescufi carlescufi carlescufi approved these changes

@ns-tolu ns-tolu ns-tolu approved these changes

@nordicjm nordicjm nordicjm approved these changes

@umapraseeda umapraseeda umapraseeda approved these changes

@kkasperczyk-no kkasperczyk-no kkasperczyk-no approved these changes

@annwoj annwoj annwoj approved these changes

Assignees

No one assigned

Labels

doc-required PR must not be merged without tech writer approval. manifest manifest-find-my manifest-matter manifest-zephyr

Projects

None yet

Milestone

3.0.0

Development

Successfully merging this pull request may close these issues.

8 participants

@rghaddab @NordicBuilder @carlescufi @ns-tolu @nordicjm @umapraseeda @kkasperczyk-no @annwoj